Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Fri, 11 Nov 2005 14:36:16 +0000 (15:36 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Fri, 11 Nov 2005 14:36:16 +0000 (15:36 +0100)

Trivial merge